DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I94e6e6b9f5c65db300c3548681303c8496b489be Change-Id: I38c4c25eae7dcc11aa34c051f1cac670cb9da2c0